Skip to content

fix: start line not working in multiple apply diff #5019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 23, 2025
Merged

fix: start line not working in multiple apply diff #5019

merged 1 commit into from
Jun 23, 2025

Conversation

@samhvw8
Copy link
Contributor

@samhvw8 samhvw8 commented Jun 22, 2025 •
edited by ellipsis-dev bot
Loading

Related GitHub Issue

Closes: #5018

Description

Fix start line extract from tag not pass into start line applyDiffSingle

Test Procedure

Pre-Submission Checklist

  • Issue Linked: This PR is linked to an approved GitHub Issue (see "Related GitHub Issue" above).
  • Scope: My changes are focused on the linked issue (one major feature/fix per PR).
  • Self-Review: I have performed a thorough self-review of my code.
  • Testing: New and/or updated tests have been added to cover my changes (if applicable).
  • Documentation Impact: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
  • Contribution Guidelines: I have read and agree to the Contributor Guidelines.

Screenshots / Videos

Documentation Updates

Additional Notes

Get in Touch

Important

Fixes start line handling in applySingleDiff to correctly use _paramStartLine in multi-file-search-replace.ts.

  • Bug Fix:
    • Fixes start line handling in applySingleDiff in multi-file-search-replace.ts by using _paramStartLine if provided, ensuring correct line number usage in multiple apply diff scenarios.
  • Behavior:
    • Ensures startLine is set to _paramStartLine or extracted from match in applySingleDiff.
    • Affects how diffs are applied when multiple diffs are processed in applyDiff.
  • Misc:
    • No changes to tests or documentation noted.

This description was created by Ellipsis for 3b96a37. You can customize this summary. It will automatically update as commits are pushed.

@samhvw8 samhvw8 requested review from cte, jr and mrubens as code owners June 22, 2025 16:43
@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. bug Something isn't working labels Jun 22, 2025
@hannesrudolph hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Jun 22, 2025
@daniel-lxs daniel-lxs moved this from Triage to PR [Needs Prelim Review] in Roo Code Roadmap Jun 22, 2025
@hannesrudolph hannesrudolph added PR - Needs Preliminary Review and removed Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. labels Jun 22, 2025
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 23, 2025
@mrubens mrubens merged commit 5bc3af1 into RooCodeInc:main Jun 23, 2025
25 checks passed
@github-project-automation github-project-automation bot moved this from PR [Needs Prelim Review] to Done in Roo Code Roadmap Jun 23, 2025
@github-project-automation github-project-automation bot moved this from New to Done in Roo Code Roadmap Jun 23, 2025
cte pushed a commit that referenced this pull request Jun 24, 2025
@samhvw8 @cte
fix: start line not working in multiple apply diff (#5019)
523207a
Alorse pushed a commit to Alorse/Roo-Code that referenced this pull request Jun 27, 2025
@samhvw8 @Alorse
fix: start line not working in multiple apply diff (RooCodeInc#5019)
8ba50c5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrubens mrubens mrubens approved these changes

@cte cte Awaiting requested review from cte cte is a code owner

@jr jr Awaiting requested review from jr jr is a code owner

Assignees

No one assigned

Labels

bug Something isn't working lgtm This PR has been approved by a maintainer PR - Needs Preliminary Review size:XS This PR changes 0-9 lines, ignoring generated files.

Projects

Roo Code Roadmap
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

start line not working on multiple apply diff

3 participants

@samhvw8 @mrubens @hannesrudolph